Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update scoped_tls to 1.0 #58748

Merged
merged 2 commits into from
Feb 27, 2019
Merged

update scoped_tls to 1.0 #58748

merged 2 commits into from
Feb 27, 2019

Conversation

hellow554
Copy link
Contributor

scoped_tls has been updated to version 1.0
This PR will hopefully merge flawlessly :)

This fixes, among others, alexcrichton/scoped-tls#9

Note, that the nightly feature has been removed in alexcrichton/scoped-tls@64bd7b8

@rust-highfive
Copy link
Collaborator

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:308c9b5d:start=1551171497028421291,finish=1551171497904482057,duration=876060766
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:05:06] 
######################################################################## 100.0%
[00:05:06] extracting /checkout/obj/build/cache/2019-02-17/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:05:06]     Updating crates.io index
[00:05:19] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:05:19] Build completed unsuccessfully in 0:00:26
[00:05:19] make: *** [prepare] Error 1
[00:05:19] Makefile:70: recipe for target 'prepare' failed
[00:05:20] Command failed. Attempt 2/5:
[00:05:20] Command failed. Attempt 2/5:
[00:05:20]     Updating crates.io index
[00:05:20] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:05:20] Build completed unsuccessfully in 0:00:00
[00:05:20] Makefile:70: recipe for target 'prepare' failed
[00:05:20] make: *** [prepare] Error 1
[00:05:22] Command failed. Attempt 3/5:
[00:05:22] Command failed. Attempt 3/5:
[00:05:22]     Updating crates.io index
[00:05:23] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:05:23] Build completed unsuccessfully in 0:00:00
[00:05:23] make: *** [prepare] Error 1
[00:05:23] Makefile:70: recipe for target 'prepare' failed
[00:05:26] Command failed. Attempt 4/5:
[00:05:26] Command failed. Attempt 4/5:
[00:05:26]     Updating crates.io index
[00:05:26] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:05:26] Build completed unsuccessfully in 0:00:00
[00:05:26] make: *** [prepare] Error 1
[00:05:26] Makefile:70: recipe for target 'prepare' failed
[00:05:30] Command failed. Attempt 5/5:
[00:05:30] Command failed. Attempt 5/5:
[00:05:31]     Updating crates.io index
[00:05:31] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:05:31] Build completed unsuccessfully in 0:00:00
[00:05:31] make: *** [prepare] Error 1
[00:05:31] Makefile:70: recipe for target 'prepare' failed
[00:05:31] The command has failed after 5 attempts.
---
travis_time:end:0075cc40:start=1551171843181282917,finish=1551171843186072022,duration=4789105
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03dd65aa
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:23717e51
travis_time:start:23717e51
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:05288580
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@hellow554
Copy link
Contributor Author

There are some old dependency versions in rustc-ap-syntax, rustc-ap-syntax_pos. Should I update them as well?

@Xanewok
Copy link
Member

Xanewok commented Feb 26, 2019

These are autopublished from the rustc code so we need to first update the actual libsyntax{,_pos} here in-tree and then when that change propagates to crates.io we can bump those in a lockstep (together with tools) later on.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Feb 26, 2019

📌 Commit 56fb287 has been approved by estebank

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 26, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
update scoped_tls to 1.0

scoped_tls has been updated to version 1.0
This PR will hopefully merge flawlessly :)

This fixes, among others, alexcrichton/scoped-tls#9

Note, that the nightly feature has been removed in alexcrichton/scoped-tls@64bd7b8
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
update scoped_tls to 1.0

scoped_tls has been updated to version 1.0
This PR will hopefully merge flawlessly :)

This fixes, among others, alexcrichton/scoped-tls#9

Note, that the nightly feature has been removed in alexcrichton/scoped-tls@64bd7b8
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
update scoped_tls to 1.0

scoped_tls has been updated to version 1.0
This PR will hopefully merge flawlessly :)

This fixes, among others, alexcrichton/scoped-tls#9

Note, that the nightly feature has been removed in alexcrichton/scoped-tls@64bd7b8
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
update scoped_tls to 1.0

scoped_tls has been updated to version 1.0
This PR will hopefully merge flawlessly :)

This fixes, among others, alexcrichton/scoped-tls#9

Note, that the nightly feature has been removed in alexcrichton/scoped-tls@64bd7b8
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
update scoped_tls to 1.0

scoped_tls has been updated to version 1.0
This PR will hopefully merge flawlessly :)

This fixes, among others, alexcrichton/scoped-tls#9

Note, that the nightly feature has been removed in alexcrichton/scoped-tls@64bd7b8
bors added a commit that referenced this pull request Feb 27, 2019
Rollup of 14 pull requests

Successful merges:

 - #58075 (Fix for issue  #58050)
 - #58627 (rustdoc: move collapse and unindent docs passes earlier)
 - #58630 (Make `visit_clobber` panic-safe.)
 - #58678 (Deny `async fn` in 2015 edition)
 - #58680 (Fix an indexing error when using `x.py help`)
 - #58703 (Fix copy-pasted typo for read_string return value)
 - #58744 (Update dlmalloc to 0.1.3)
 - #58746 (std: docs: Disable running several Stdio doctests)
 - #58748 (update scoped_tls to 1.0)
 - #58749 (Reduce Repetitions of (n << amt) >> amt)
 - #58752 (Update string_cache_codegen to 0.4.2)
 - #58755 (Clarify `rotate_{left,right}` docs)
 - #58757 (Normalize the type Self resolves to in an impl)
 - #58761 (Add tracking issue for the unwind attribute)

Failed merges:

r? @ghost
@bors bors merged commit 56fb287 into rust-lang:master Feb 27, 2019
Xanewok added a commit to Xanewok/rust that referenced this pull request Mar 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 10, 2019
librustc_interface: Update scoped-tls to 1.0

Done previously as a part of rust-lang#58748.

r? @Zoxc
Centril added a commit to Centril/rust that referenced this pull request Mar 10, 2019
librustc_interface: Update scoped-tls to 1.0

Done previously as a part of rust-lang#58748.

r? @Zoxc
Centril added a commit to Centril/rust that referenced this pull request Mar 10, 2019
librustc_interface: Update scoped-tls to 1.0

Done previously as a part of rust-lang#58748.

r? @Zoxc
Centril added a commit to Centril/rust that referenced this pull request Mar 10, 2019
librustc_interface: Update scoped-tls to 1.0

Done previously as a part of rust-lang#58748.

r? @Zoxc
Centril added a commit to Centril/rust that referenced this pull request Mar 11, 2019
librustc_interface: Update scoped-tls to 1.0

Done previously as a part of rust-lang#58748.

r? @Zoxc
Centril added a commit to Centril/rust that referenced this pull request Mar 13, 2019
librustc_interface: Update scoped-tls to 1.0

Done previously as a part of rust-lang#58748.

r? @Zoxc
@hellow554 hellow554 deleted the scoped_tls branch May 7, 2019 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants